Fix conflict

Fix conflict in rm_danzer_testroom