fixed merge description bug
fixed some sphinx warnings