Added ref guard to mergeConflict receive handler