fixed conflicts
restarted Meteor, downloaded packages, deleted extra JS files
fixed merge conflicts with js