useful guides

https://gist.github.com/silent1mezzo/1670623

fix the fking bad merge in git