Fixed conflict with w3c edit