Fix references and citations
Fix merge conflict