add start compare
solve conflict