With the convergence of the field of Cyber-Physical Systems (CPS) and the "Internet of Things" (IoT), a new generation of systems, dubbed CPS/IoT systems [1], have come about. These systems focus on controlling physical environments semi or even fully autonomously based on an operational policy designed by the user for their environment. However, conflict in the decision-making processes these systems employ can easily happen. These conflicts arise due to a confluence of factors such as the distributed nature of CPS-IoT systems, changes in user preferences, or the use of multiple intelligent sub-components. For this work, we will be investigating the current research concerning the problem of Operational Policy conflict detection and resolution for CPS-IoT Systems. This survey will include the current state-of-the-art in conflict detection in CPS-IoT systems as well as a brief overview of conflict detection methods in related fields such as distributed systems and Software-defined networks. Our aim with this analysis is to present a summary of the key insights, objectives, and methods of addressing policy conflict detection and resolution pioneered by these fields.