Started prime problem
Resolved merge conflict