removed merge conflicts and beautified the code
moved styles to css file in styles folder