Fix the error messaging and tests for conflicted deps