removed all target=_blank
fixed merge conflicts