Adding .gitignore file to exclude conflicted file on production server