Comit Changes1
commit from update branch
modification done from updatepackage
 commit from mainm branch
resolved the conflicts