hit function
hit method fix
new main class
game merge conflict fix