edit readme again
fix conflict and push dev.txt