Cleaned .gitignore merge conflict.