adding function add
conflict resolved