fixing more conflicts
fix typo in filename
merge internetSpeed into ConnectionQualityIndicator