Only map diffgets when not in conflicted mode