Is the problem that the merge conflict occurs on the same saved object? Or is it that the order of saved objects changes making it hard for git to keep track of which lines are matching?
It would be useful if you could give an example merge conflict.