merge tanan

merge everything