git conflict

1 job for master in 2 minutes and 43 seconds (queued for 1 minute and 1 second)