add new func on branch dev
conflicts fixed