UNSOLVED Screen cannot rotate after upgrade to 2.4.0

[Sun]

Yesterday, after update to v2.4.0 and follow the wiki Load normally with rotate-1

Today, boot normally but the screen both on rp3 frontend and magic mirror didn’t rotate at all.

Where do I need to re-correct this?

[Sun]

After redo all the wiki step and reboot. Rotate correctly. Not sure if I have to set every time?

[Sun]

This time I try to upgrade another mirror got this

pi@SAMUIMIRROR:~/MagicMirror $ git pull && npm install
Updating 60b9a5b…6aa156d
error: Your local changes to the following files would be overwritten by merge:
modules/default/alert/alert.js
modules/default/calendar/README.md
modules/default/calendar/calendar.js
modules/default/calendar/calendarfetcher.js
modules/default/compliments/README.md
modules/default/compliments/compliments.js
modules/default/currentweather/currentweather.js
modules/default/newsfeed/README.md
modules/default/newsfeed/fetcher.js
modules/default/newsfeed/newsfeed.js
modules/default/newsfeed/node_helper.js
modules/default/weatherforecast/README.md
modules/default/weatherforecast/weatherforecast.js
package-lock.json
translations/de.json
translations/en.json
translations/it.json
translations/nl.json
translations/pt_br.json
translations/translations.js
translations/zh_cn.json
translations/zh_tw.json
Please commit your changes or stash them before you merge.
Aborting

[Sun]

Read and Read and found the solution regarding cannot upgrade to 2.4.0
git reset --hard; git clean -df;