git pull issue. Please advice

[Svemar]

Hi Joe,

As I was unable to login to the Corebos anymore, so
I executed git merge --abort as You recommended.
After this I am able to login to Corebos, but I saw some visual changes (font, icon design).

Please also find attached outputs of git pull, git status and git log commands.
Please advice what to do in order to regain the ability to update the system.

Thanks a lot.
Svemar