Resolved Conflicts for failing test cases.