Another conflict fix
And a random fix as well