show git detail
fix merge