Fix Slim merges