resolve conflict

aky15

2023-03-21 4dc3a1b011e1e72eb737417b8e0e0bec7a7e3a6e

 .github/workflows/main.yml

@@ -5,7 +5,7 @@
      - main
  push:
    branches:
      - dev
      - dev_wjm

jobs:
  docs: