merge fix
Merge pull request #1052 from xliiv/fixed-redirect-merge

merge fix