Renamed PlayerMovement to PlayerMovementPaul. This might fix the merge issues