main_branch_update
conflicting_remote_commit
conflicting_local_commit