add dev.txt
o
o:
confilct fixed