feedback issue resloved
conflict resloved