added missing content from merge