Trying to create conflict part 2
Fixing created conflict