execute function
fixed merge conflict