fixed elif typo
merge