removing conflicted lines from gitignore