Camera: fix wrong merge