merge from gamua