getting there
merge with remote