removed the last conflict message stuff.