added tuples
conflicts