Fixed a missed conflict