change rooms names from 3_xxx to r3_xxx
resolved conflicts