Settings: fix conflict error (i forgot git pull)