changes made and updated
merge resolved and updated