Test merge2
solve conflict