Try to use Kaleidoscope as git merge tool
Install enfs on laptop