Fixed a few leftover merge conflicts