app: fix build

Merging issues...