manual resolving auto-merging confliction in the Merge Request confliction