added deals slider
fixed merge errors