create a file
merge test no fast forward
add a file