fix merge conflict
fixed merge errors