fix path of bower
fix merge conflict .bowerrc