Fixed merge behaviour