Fix the unsolved conflicts for doc build