resolve eroor merge