Fixed merge conflict in playercamera