fixing little merge conflict
created dashboard image
pulling
pulling
Fixed a merge error