d
fixed merge conflicts