Local update on 404.php
404.php merge