Some %fine merges weren't doing anything, oops