fixed gitignore merge conflict