Merge fixed for new col names