Remaining useless else
fixing conflicts.