line 3a
line 120
merge and resolve