Nearly finished warehouse design
resolving merge