changed format so citations don't run into margins
reconciled conflict, I think
reconciled conflict, I think