branch modified
master branch fixed
merging conflict resolved