deleted i after merging