fix: resolve merge conflict

4 jobs for !156 with slb/sb/fix-unlock in 17 minutes and 17 seconds (queued for 3 seconds)
latest merge request