move repo to ~
merge with remote