make remote conflict