solving conflicts
resolving conflict