Conflicts Rectified