Heal all works.
fixed merge conflicts