change contact deatails
resolved conflicts