Room validated
Fixed merge conflicts