ttlogmerge: fix brainless git merge error