remove herring-cove
remove herring-cove
resolev merge conflict