Fix the incorrect merge conflict resolution in #88.#89

weiiwang01 merged 3 commits into

maincanonical/aproxy-operator:mainfrom

fix-merge-conflictcanonical/aproxy-operator:fix-merge-conflictCopy head branch name to clipboard