Corrected a screwup in git merge