feature 2 added
merging conflict from master fixed
feature 1 complete commit
branch1 and master conflict resolved