Fixed Conflicts