yes that’s a possibility too, but then the typical merge resolution rules should apply. If there are common areas modified that is going to incur a manual revie

yes that’s a possibility too, but then the typical merge resolution rules should apply. If there are common areas modified that is going to incur a manual review. There’s no magic automation I’d really entrust to fixing that.