Fail the build if there are conflicts