resolving merge conflicts
Resolved additional merge conflicts.
Still resolvin'
Outpost inventories are working properly. New Outposts can be set insantiated from prefabs directly.