Updated CLI
saving working state
merged conflict
Working.. need to reduce memory usage now
merged conflicts
merged