Newly Added BIGIP's not Appearing in AST

[powerballad]

I added two new endpoints in the bigip_receivers.yaml and ran the config helper script and then ran docker compose up. But the two new endpoints are not appearing in AST. Did I miss something or is there another file that needs to be edited besides bigip_receivers.yaml?

[powerballad]

It looks like the new receivers file is not getting updated in the otel_collector/receivers.yaml.

[powerballad]

I fixed the above issue. But, I noticed I was running version 0.9.3 so I tried updating to the latest version and get the below error. please help?

/application-study-tool$ sudo git stash
config/ast_defaults.yaml: needs merge
config/bigip_receivers.yaml: needs merge
/application-study-tool$ sudo git fetch --tags
/application-study-tool$ sudo git pull origin main
error: Pulling is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm '
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.