now plots
merged branches