local edit devtmpfile2
merge remote