Added BMI calc
Fixed merged conflict