repository change should conflict with local