resolved conflicts fully