Resolve conflict in gitIgnore