resolved merge conflicts in dev.txt