merge home work
conflict resoved
0
merge ok