fixing merges. added wall collision detection