resolved conflicts'