remove conflicts from localUpdatesNoConfilcts