I undid these changes
merged operators and array conflicts