branch issu1 was added.
added conflict experiment in sample.txt.
issue3 conflict
conflict free?