merged deleted stuff