I changed the line below HR
I resolved the conflict