fixed intro error
fixed merge