fixed all add and remove actions
merge