commit readme to dev branch...
test conflict...
add readme to master...
add readme to master again...