Handling Conflicts in an Evolving Product