Fixing Conflicts...