git isn't recognizing any other of my merged changes, let's see if this helps