Merge in firebase changes