forgot some variable declaration in partial merge