recursive merge fixes