fixing articlebody template merge problems

fixing some problems from broken merge