resolve more conflicts
fix more merging errors
use git for backup when editing docs