Fixed merge conflict
Fixed the merge conflict with the gitignore file.