revert merged changes