Resolving conflicts with remote