How did you manage to "fix things up"? Do you feel that you've truly forgiven her?