Trying to update the .gitignore file.
resolve conflicts
Trying just adding modified files.