add spy activity
fix conflict