camera.c: fix bad merge