Keep rename/rename conflicts of intermediate merges while doing recursive merge