stop redirect from happening
merge