resolved rest conflicts