oops
fix merge conflict
fixed room notes/prompt display