minor modifications
fixed merge conflict