init
merging remote and local