module1/sub1 changes
module1/ sub22
merge change sub1 and sub2
head and conflicts fixed