Accidentally committed local version of settings during the last merge/stash/commit