conflict resolution double check