feature1 test
conflict resolved
problem
proplem solved
new line