merge with local repo
clean up