fix remark on merge faillure