merge conflic details added