Fixed scss file after merge