Revert "Revert "mergeconflict resolevd""

This reverts commit 5d85adf136c67f86e6f57160fc9eb236b65967e7.
Updated to sebbes player files