Resove conflicts
move to wikipedia package