Data bind answers page
Fix conflicts