Merge error again ...