made change to body.
actual body changed
actual body changed again
solved conflict on about