game Refactored
resolved Conflict