resolved player model conflict