Add alias for cleaning conflicted copies in git