Playing around with javascript errors
Fixing conflics
Fixed merging errors
Fixing conflicts and removing a few sections