started wallfunc
fixing merges