FIX: necessary git catchup (bad merge)