trying to fix wrong merge