recover (I hope) from bad merge