Sumo Elevator - Merge Conflict