I am trying to fixed the confilcts

Just see the result.