dev2
merge & fix dev.txt