fix conflict message