line 1
test
not 1 but first
not 1 but 1st
conflict fixed