function calling update
function calling update
conflict resolution