init commit
merge local with origin