initial dev commit
change dev.txt
edit dev.txt on branch
merge dev with master
fix merge conlfict