better app tracking
merge