Fix unique column conflict bug