feat: flatten nested if-else statements with equivalent conditions

feat: flatten nested if-else statements with equivalent conditions #2693