Merged 3dMouse with master. (without merge tool).