Before a big hammer
Trying to fix the conflict