Moving in day, Part 2
Conflict merge