We need to ensure that flags (i.e. validity, admin) are compared for the conflict resolver. https://redmine.cbrain.mcgill.ca/issues/4318