revert should also mark path as merged if applicable