optimizing conditional statement
merge branch