fixing slightly bad merge by me

Builds and runs correctly on device.