resolved conflicts.