resolved conflicts issue