remove git-merge junk, CVS merges have been easier