edit 404 and style
solve merge fail
fix merge conflicts