merge from god kirin