solved merge conflict on schema.sql