finished Research footer
fixed conflicts