Updated player
Merged conflicts