Fix routes after resolving conflict