Rename conflicting_version_check!

check_version_conflict makes more sense to me, so I changed it.

See #843
Add missing "then"
Flatten check_version_conflict

Changed the if block to an early exit with a reversed conditional for
easier reading.

See #843
Hide raise_if_conflicts from documentation

There is no reason for a user to call this method

See #843
Add #843 to History