final phase
merging
merging test
deleted tipue.js