merge conflict gitignore resolved again