Fix after github conflict