rework add mark, start remove
resolving conflicts