first.txt commit
commiting first.txt tp preserve changes
first modified on second branch
first modified chck merge conflict
temp file added