resolving merge conflicts
actually loading scripts now