chore: Fix/merge conflict resolution#48

george-lhj wants to merge 2 commits intomainAI4quantum/maestro-builder:mainfrom

fix/merge-conflict-resolutionAI4quantum/maestro-builder:fix/merge-conflict-resolutionCopy head branch name to clipboard