fix wrong merge in quarter