added git info to bash
resolved conflicts