Fix merge regression

parent ab676e76
Pipeline #1431 passed with stage
in 65 minutes and 43 seconds