fixed mmerge conflict in .gitignore
redo merge conflict for .gitignore