(#27) - removed some author logic - can't conflict if the author is not assigned