Removed conflict from gitignore