add new line on readme.txt on branch feature1
modify readme.txt for merge
merge conflicts of file readme.txt
add new line in test1 of master