conflict
incorporating new vecbase