README file

This line is from feature branch

This line is written to have a conflict with feature branch

Will this merge without conflict? yes but we fixed it

Another merge conflict? yes

Will this merge without conflict? yes it did. from feature

Just to make another commit in feature

This file is no longer in feature