Avoid error by 404 page
merge conflict