resolving comflits