Added hg merge settings