Fixed Styling
Resolved merge conflicts
Resolved more merge conflicts