Added cites for 2g
fixed mergeconflict in bib