working on player apis
resolving conflicts