Main Conflicts Fixed