Issue #422 fixing conflicts and redirections