Modified branch and made a conflict for merging