Fix merges so Shark compiles