Gixed merge conflicts