Revert merge problem AND fix email sender