merge recently fix