resolved conflicts
conflict resolution