Fixed Styling Bugs and no merge conflicts