Anybody getting to this question in 2025, I just solved this issue by changing the target branch to a random different one, save, then changed it back to master, and tada: "conflict" was gone.