Combine conflicting migrations into a single migration.