Merge error com in up