add friendly HTTP responses
solve conflicts