small changes
  merge