plots
merge fix