Manual merge scss