test commit with add
i love you
collision test
only one line remain
conflict fixed