update in billform implemented
update in billform implemented and merge conflict resolved