Merge this conflicts and nobody gets hurt 4