Fix merge conflicts
CSS and HTTP Methods