Conflicts Fixed