merge prep
fixed bug 50 except from ceiling to wall