Fixes merge conflicts.
Fixes header and recipients page.