look to the code

i solve the conflict problem