reverted to before conflict tests