There are indications that the dispute between Total Upstream Nigeria Limited (TUPNI) and Samsung Heavy Industries (SHIN) over the multi-billion dollar Egina Deepwater oilfield project has been resolved out-of-court.