created file1 file2
added another line of text
another text edit
merge branch new_feature