update git note
nuke and restore a branch
formatting fixes, ls
fix conflict