changes to undo conflicts
reverting it the hard way