No matches were found for subject:"\[jira\] \[Created\] \(SPARK\-30433\) Make conflict attributes resolution more scalable"