Resolve conflict for WikiFactory.php