Conflict: Remove Conflict Immediately (Ross)

Nathan Hinkle
August 27, 2017