fix build wall bug
merge code