Working scene with walls and rectangle
fixed merge conflict