creating wireframe 8 and 9
merge conflict solving
solving merge conflict