Merge ROM stuff with all updates