worked on the rendering part of the project
fixed merge conflict