Fixed Merge errors between gameStructure & Master