add file to nick feature.txt
nick feature.txt modifed
f1 modified
Merge branch 'nick-feature'
modify f1
Revert "modify f1"

This reverts commit 74bccfb3a25c3247120ce703e39210a72708e53c.
modify master new f.txt
add f2 to test.ext
fxxx
Merge branch 'nick-feature'

Conflicts:
	test.txt
add something
nick feature
Merge branch 'nick-feature'

Conflicts:
	test.txt
bug fixed
add something
bug fix 2
add something 2
add git ignore
modify git ignore
asdf