athlete validation
athlete validation merge conflict resolution