fix for required parameter
fixed merge conflict