resolved goal - ours instead of theirs