fix wrong merge