redirection
fixed merge inssues