starting on camera page
fix camera settings button
conflict resolution
 fixed merge