Fixed merge errors. Adding draw inventory.