add tabbar
merging