Manually merge room-images and master