Pointerlock addition
Conflict Fixes