Fixed Conflicts.