merge additional changes