Fixed details conflict