Resolving more conflicts