revert test conflicts