Mess with the tree in a unknown way due the limitations of a tool. No idea which

Mess with the tree in a unknown way due the limitations of a tool. No idea which
gsmhandset.state to delete (see the below output of mtn), drop both...
mtn: 2 heads on branch 'org.openembedded.dev'
mtn: [left]  3e22c6ee5af012d09e9027c2ade50920300fb0f2
mtn: [right] 74f4e875283dd639a1a426c4ce2930b205f84ac1
mtn: warning: orphaned node conflict on node 24181, dead parent 22904, name gsmhandset.state
mtn: warning: resolve non-content conflicts and then try again.
mtn: error: merge failed due to unresolved conflicts