Only add columns that haven't already been added
Merge branch 'feature/fix-duplicate-columns'