add member tracking
merge