merge'
merge
change player