"conflict fixed"