simplify player
resolve conflict