Player images:
Fix merge conflicts.