First version
merging with remote repo