merge new_branch and visasak branch