Fix mergeable if-the-else statements