Fix one merge error and fix associated test.