Corrected the conflict