another patch for merges