Tag Resolve conflicts