delete & modify coms
Fix Merge conflict