solve conflicts and double records