merge fix

missing a div