deleted the merge conflict and added the recommended workflow which was accidentally deleted