added conflict in conflict_branch
added conflict in master
conflict fixed