fix padding
fix
resolved scss conflict