added hash field to "page" and "complete" events
fix conflicts