changed to get a conflict
fixed a conflict