Conflict issue between main and development branch.

Hello,
We re-created new development branch as we had conflict issue with main. After creating in GIT everything looks correct with zero file mismatch. However when we switch to dbt and go to development branch it shows “pull from remote” option and on clicking that it give “resolve conflict and sync” which is not going every after resolving. We dont understand that its giving conflict issue only in dbt but not in GIT (we tries creating merge request from GIT manually and it worked fine).

Have you specified development as your custom branch, if it’s not your default branch? How do I use the `Custom Branch` settings in a dbt Cloud Environment? | dbt Developer Hub