Fixed a conflict that wasn't flagged locally.