removed unused activities for the camera
fixed merge conflict
fixed merge conflict