Rihanna's new album will include Chris Brown collaboration