fix camera settings button
conflict resolution