removed <<<<<HEAD from gitignore