Now resolves both moves at the same time
Merge
Merge