Updated wikiparse for parsing data
Fixed merge conflict with wikiparse