fixed conflictswith