resolving more conflits