resovle confilict
 resovle confilicit again
 resovle confilicit again by hand