compressed yodamerge code for Scatter{1,2,3}D into one block by accessing the relevant axis by number. Also fixed small bug where the errors in the add-mode where the square root of the error was never taken, and so the errors were being saved as squared