- When resolving conflicts, delete clock.h/.cpp, keep both in CMakeLists.cpp, accept current in SettingWatchFace.cpp, and keep both if there are any changes in fonts.
- Add entry to WatchFace enum in displayapp/apps/Apps.h.in
- Remove `DisplayApp* app` param from constructor in .h and .cpp and remove Screen(app) from initializer list on constructor in .cpp
- Add const to batteryController and bleController is present in constructor params and in private members in .h
- In .cpp, remove `#include <date/date.h>` and convert calls to get time to format like in working watch faces. For example: