GitLab

Two "<<<<<<< HEAD" lines remained from what seems to be a previous patch
conflict.
Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>