Move
Conflict resolve