I haven’t yet looked through the whole file, but right at the top it seems the emonpi repo has failed to update because you have some local changes.
git pull /home/pi/emonpi
* master
wifiap
On branch master
Your branch is behind 'origin/master' by 142 commits, and can be fast-forwarded.
(use "git pull" to update your local branch)
Changes not staged for commit:
(use "git add ..." to update what will be committed)
(use "git checkout -- ..." to discard changes in working directory)
modified: lcd/emonPiLCD.cfg
Untracked files:
(use "git add ..." to include in what will be committed)
1
no changes added to commit (use "git add" and/or "git commit -a")
error: Your local changes to the following files would be overwritten by merge:
lcd/emonPiLCD.cfg
Please, commit your changes or stash them before you can merge.
Aborting
Updating b9af6a8..57ca523
This is not the first time this has come up! (see Has /var/log Filling up Been Fixed? - #4 by pb66) I’m gonna take a wild stab and say you have possibly edited the timeout for the lcd backlight?
You need to either undo the changes, git stash or force an update, depending on what the changes are and if you want/need to keep them.