I have a strange merge conflict problem, which i am not sure why its happens on certain repository only, (May be its due to repo settings on the merge rules).
Usually if
