merge conflict resolution, finally fixing 'd' vs 'D' issue