add deleteActivity test
fix merge conflict