fixed a conflict problem