Conley. They then flipped crowder for justise Winslow (who didn't play much) alongside Andre iguodala and Solomon Hill. They flipped Grayson for Sam Merrill and two seconds.
Really, the Conley trade gave ja the keys and cleared some cap space. They already had most of their pieces.