remote conflict that should conflict