Merge error changes