basicinfo and history
after merge