Merge columns with different values