merge from author