Removed color argument to players
Fixed merge conflicts