merage hepochen

complie scss file