implemented simple tabs
fixed merge conflicts