Removed conflicted .gitignore~ from seven months ago