Merged conflict in structure.sql