fixed alt body stripping
fixed conflict