working on if statement
merge