Fixed conflicts and changed player image`