fire up with firebase
merge fix