from git2
second line
another conflict
third line
forth line
and here too
php storm line
terminal line
phpstorm line
phpstorm one line more
git2
new line