merging in Selahs redactor change history