More merging...
Player fix (ONE FUCKING LINE)