add content 777 in branch dev
add 888 in readme.txt
add 999 in readme.txt
resolve conflict