test-d
fixed merge conflicts