added citation file, few small edits
resolved merged conflict