resolved mergeconflict in .gitignore