fixed factories, the xml file changes now work with new units
fixing merge conflictw