Fixing old merge; GIT didn't complain before??