files pushed for bower
removed conflict