fixed a missed conflict