avoiding merge conflicts
kill the conflict