styling error page
fixing conflicts