Fixing conficlitng issues in CameraController