Added git-imerge
updated trackball setup