added case statement
fixed merge