fixed breaking bug in babel
fixed merge conflict