listing only active data
Merge origin/master