undo change to facilitate merge