fixed the conflict and the camera