Fix problems after merge conflicts

Fix the filters in the solution
Add file pair for player class