changed authors
fixed conflict, added original authors