Fixed conflicts and regenerated CSS files