Fix merge + remove to offline list