fixed conflict github garble