resolves conflict in more by author block