manually resolved merge conflicts (includes) in cluster.cc and multinest.cc
	# Please enter the commit message for your changes. Lines starting
	# with '#' will be ignored, and an empty message aborts the commit.