Resolved Sync Conflicts

It appears that my sync somehow caused issues with the other documents,
someone should check through these to make sure I resolved the conflicts
correctly