Fixing bad merge
Removing spurious end tag