in feature1
delete line
delete line
Merge branch 'dev' into feature1

* dev:
  delete line
Creating a new
Creating in f
conflict fixed