removed google events and trying media query
fixed merge issues