text is done. refactoring room
merge conflict