merge Salah's work