end game refactoring
end game refactoring 2
end game refactoring 3
conflict solved
end game refactoring cont