tab bar completed
MERGE resolution