git problem : You are in the middle of a conflicted merge

Fix merge conflicts

git reset --hard HEAD
git fetch origin
git reset --hard origin

How to Stop Your Mac Book Pro From Freezing with Keyboard & Trackpad Unresponsive

If you can still toggle caps lock and it dones't freeze in safe mode, you can backup and remove the directory below.

/System/Library/Extenstions/AppleIntelHD5000Graphics.kext