Manual merge playerfile with master.