removed conflicting git text