ignore git merge files: BACKUP LOCAL BASE REMOTE
whitespace