a new line from feature 1
commit from master
merge after modified