How to resolve conflicts with a remote colleague