Improved conflict management logic for customers' cf and piva codes.