Fix merge error referencing files.playCount rather than history.playCount