Modify world.txt
Modify player
Master chenge player
Merge complete