resolved coflicts

@manoj2589 @esmpriya look at the conflicts resolved..