Fixed vanilla version of wall merging