fixed conflits