Conflict resolvation code