resolve message conflict