Manually remove rur-builder files, it seems "merge --strategy subtree" does some matching and cannot recognize anymore that this concerns the same rur-builder folder"
Merge branch 'master' of github.com:mrquincle/aim-bzr