modify the haml
remove the conflict