Fixed merge line; added missing bracket