resolve extra div tag from merge conflict