undo some of Ram's merge