resolving conflicts and adding the option for 302 redirects