handling conflict

Ben Kreider