re-added my GUEST_PAGE and fixed conflicts