[*] Conflicts resolved
Checking pipeline status.
enabled an automatic merge when the pipeline for 18fd8cf4 succeeds
merged
mentioned in commit ff6d32d6
