create new file
add rebase.txt  to staging area
add content
just testing
woops
yes
add more content
creation of important configuration file
test mergconflict
test
merge done