Fixing merge conflict.
Fixing .gitignore.