Fixed missed merge conflict
Fixed missed merge conflict

KaptenJon/calvin-base,EricssonResearch/calvin-base,les69/calvin-base,les69/calvin-base,EricssonResearch/calvin-base,EricssonResearch/calvin-base,les69/calvin-base,KaptenJon/calvin-base,EricssonResearch/calvin-base,les69/calvin-base,KaptenJon/calvin-base