In the resolve conflicts popup for the designer, it usually prompts you to resolve an IP conflict that comes from the client who is logged into the designer. To me this seems like something that is client side and should be ignored when comparing project resources.