wall and background finished
merge
merge fix