Prevented two-of-a-kind-spawning
Resolved merge conflict