Not exactly sure what happened

It seems I branched off of the master branch, and now I'm trying to merge the work I've down recently