merge changes from author