Shift WIP
update dumps that had conflicts during merge