Update git cheatsheet and change folder name
Resolve conflict