Merge & rebase drag and drop. Fixes #5