Clean up code and prevent possible duplicated output in _grid.scss
fixed conflicts