fixed more merge conflicts
deleted bower.json, not necessary for now