Fix wrong handle of merge conflict + Cosmetics