Fix all the errors which are related to versionconflict#12

skstanwar wants to merge 1 commit into

CAVIND46016:masterCAVIND46016/Simple-Calculator-Web-app:masterfrom

skstanwar:masterskstanwar/Simple-Calculator-Web-app-skstanwar:masterCopy head branch name to clipboard