Fixed '??' versions appearing in conflicts messages