Minor
solved conflict
updated camera and cards pos