Add more references
Fix merge conflicts in references