update GitAux
fixed conflict