change player function
merge