Fix missed confliction