fix issues with fanout after merge