resolving conflicts effectively