Solved Conflicts, tests Failed