Add all of the changes (can't be arsed to go through and manually merge all commits, they aren't useful by themselves).