Not sure what I am doing, trying to merge to mine

Trying to merge to mine I can see changes, not sure if I am doing this correctly.