conflict1
resol conflict