Committing to get complete player file
merge conflicts solved