diff --git a/dialects/dialect.go b/dialects/dialect.go
index 69684b2e..3e3a3467 100644
--- a/dialects/dialect.go
+++ b/dialects/dialect.go
@@ -333,10 +333,14 @@ func ColumnString(dialect Dialect, col *schemas.Column, includePrimaryKey bool)
 		}
 	}
 
+<<<<<<< HEAD
 	if !col.DefaultIsEmpty {
 <<<<<<< HEAD
 		if _, err := bd.WriteString(" DEFAULT "); err != nil {
 =======
+=======
+	if col.Default != "" {
+>>>>>>> 98251fc (Fix test)
 		if _, err := bd.WriteString("DEFAULT "); err != nil {
 >>>>>>> ab9b694 (Fix test)
 			return "", err