GIT undo merge
https://stackoverflow.com/a/2389423/417899
//get sha using gitx git reset --hard commit_sha or git reset --hard HEAD~1