Removing git merge leftovers.