Merge from pick again