Removed extra markup that was left there from last conflict
adjustments to fit original prototype