@nfoti can you remove these merge conflict markers? they'll make the doc build fail. also in the above file as well
thanks