move is_terminal check after on_conflict check #1381
+6
−6
Merged
Loading