Resolve conflict for gitignore