Fix merge conflict

2 jobs for 2-edit-menu in 1 minute and 48 seconds (queued for 11 seconds)
Status Job ID Name Coverage
  Test
passed #6416
static_code_analysis

00:00:29

 
  Build
passed #6417
build

00:01:18