Fixed Conflicts Again