change dev.txt
change dev.txt
change dev.txt
conflict fixed