Trading is prepared

+ Right click to move
+ Left click on other party to open action menu
Solve and merge conflict
Merge again