I know you automatically resolved these merges. (Can't see the changes, but everything makes sense).