"doc/user/project/merge_requests/resolve_conflicts.md" did not exist on "master"