Fixed merge problems, stop auto-generating data when adding columns
Fixing merge