fix a few merge mishaps

Change-Id: Ib1b02fa5ff24ed58cc02655ae0828d41e5696df7

(will run tests some time tomorrow)