I have a feature branch, and do some commits, At some time , I do a merge from master periodic, and fix some conflicts, but not merge back to matster yet. And some days later, I do a merge again, all conflicts processed before occur again, So why its happens, and is there a good way to deals with it?