don't require editing for conflict-free merge messages