previous merge removed "Then" line