Fix redirectToAction method
fix conflicts.