fix 3.c
max
conflict resolve