Fixing Conflicts..