Add average_score method to Resource
Fix merge conflicts