finished citations from drive
merged conflicts