added tabs to show
fix conflicts