fix merge conflict

1 job for 54-port-pipeline-to-synpp in 3 seconds (queued for 1 second)