add final scores
fix conflicts
change final score menu id
fix conflicts
remove test code
fix companyName to companyname