I forget what I changed.
Fixing merge conflicts due to outdated editor settings.