[OGDev] Edit conflict fixes.