updates to player
resolved conflicts
updates to player
fixed merge conflict