added conflict tracking and package removal
fixed up remove, set up reset_line, fixed progress bars