merge file to utouch_dev