Making sure the last merge conflict didn't mess anything up. Reuploading my workspace.