author model tests
conflicts