fixed conflict in gitignore