No matches were found for subject:"\[jira\] \[Resolved\] \(HDFS\-7936\) Erasure coding\: resolving conflicts when merging with HDFS\-7903 and HDFS\-7435"