merge conflict
remove some response views