added redirect by ReturnUrl and conlifct fix