Updating gitignore
merging conflicts