added frequently used git commands section
fixed merge problems