commit after non-backed-up version refused to work for no apparent reason, perhaps because boot into other OS caused Dropbox to clobber important files; many small changes
fixed merge conflicts in supposedly non-overlapped commits