add
conflict|iss
conflict2
solve the merge problem