merge conflict resolve

2 jobs for editable_row in 2 minutes and 39 seconds (queued for 19 minutes and 55 seconds)
latest
Status Job ID Name Coverage
  Test
passed #102408
deploy

00:01:02

passed #102407
validate

00:01:36