I was trying to merge a branch into the main branch, however I was prompted to have a conflict that I need to resolve, except that there's no conflict at all. The conflict that it stated is "Folder", which I have no idea what it means at first. And after click "Review Changes" to see the details, I couldn't spot any difference between the 2 branches too. Can anyone help with my confusion?
For further context, I'll provide the changes I've made in the main branch and the other branch. In the main branch, I changed the button color to orange. In the other branch, I've changed the header and button language, and change the button height from 40 to 56 (color is maintained).