Merge this conflicts and nobody gets hurt