add title info
solve conflict