Fixed merge errors and added requestid back