temp commit
conflict fix
remove fat
added function to get room id