updated merge order so it works correctly