Corrected the redirection after merging or canceling a merge