Resolving issues of connection and conflicts