changed function name
changed function name
fixed merge conflict