fixed conflics