resolved conflicts...