git merged version