Resolved mergeconflict in .gitignore