Fix wrong manual merge