» Resolve message conflicts