Fixing overrides I accidentally made in the conflict merges