Updated box
Added merge tool to gitconfig