Fixes conflicts between chimera:master and tribeiro:new_scheduler

Voilà :+1: