Resolving Conflict Scripts