fix gitignore merge conflict