manually undoing all the junk I created in the botched merge attempt