commented some of the cout and uncommented the showPattern cout
fixed merge conflicts