resolve merge conflicts pt 2