Fix spurious residuals of git merge