Fixed wisp
fixed merge issues