added citation and stuff
fixed conflict