Confliction error solved