removed trailing whitespaces and test citations
resolve merge conflict
remove duplicate bibliography entry