fixed Firebase problem
merged conflict