Fix merge error that caused test failure