edit test1 local
edit README local
merge remote