Wow! Fixed Merge Complications!

Uhh, don’t know what happened but its fixed, and I added more flowers…
broke javascript though. Till the next push.