Fix merge issue where the content body was rendered twice