Resolves Conflicts Automatically