resolving confilcts