merging the changes in master after comparison