Merging Head Conflict with reservations controller