Fixed Conflicts II