Merge and add a gotcha