fix lib conflicts

2 jobs for !288 with gcp-fix-conflicts in 78 minutes and 16 seconds (queued for 1 second)
latest merge request