resolve insert conflicts