works; progress indicator doesn't work very well
remove trash that git keeps putting in
merge