Merge after move
Fix regression? dirty dirty tree
Don't dispatch error twice...bad merge