local changes for pairing machine with basic git shortcuts
merged conflicts