fixed confliction