fix a few merge mishaps

Change-Id: Ib1b02fa5ff24ed58cc02655ae0828d41e5696df7
Merge pull request #154 from awong-dev/tweak

fix a few merge mishaps