fixed merge conflict
added stubbed vision app