Fixed merge order