finished citations hopefully
fix conflicts