Cleanup mergeconficts from mqtt