log merge conflicts/error at warn level instead of raising an exception.