add Firebase as service
fix merge conflict