Fixed merge oddity