Fix merge conflict in structure.sql