delete file
new file
Merge branch 'newfeature'
add new
new
add new file
remove
add newwwww
add