Merge was not actually resolved... All good now.