Player view updates
fixing merge conflicts