Resolve merge conflict

8 jobs for transmission_model_sw_architecture_revision in 127 minutes and 37 seconds (queued for 1 second)
latest