refactored contour plot in own function, fixed wrong resolved merge conflict