fixed a conflict