After merging my branch into the dev branch, the data is fetched successfully (200 status) but doesn’t render on the frontend; the page is blank when editing data. However, switching back to my branch renders everything correctly, despite no changes to the HTML file. I assumed there is problem while merging the branches but I have not yet found the differences. My stack is Java in the backend and Angular(TypeScript) in the frontend.

In normal (“content”) conflicts git will add conflict markers to the file, making it relatively clear where and what the issue is, and more importantly usually making it impossible not to resolve the conflict if there’s any sort of CI/CD (as the conflict markers will very likely make the file invalid, and are easy to search for besides).