Add a papers folder for research
Fix some merge conflicts