changed inflammation to swelling
styling stuff
fixed merge conflict
fixed conflict again