grid
merge oscar
idea misc fixed
factories
factory deleted
changes
solving merge