adds visualize
merge conflicts
solves conflict