added author
resolved conflicts