merge from gamma